new enum GtkCornerType added window_placement. new method to set

Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>

        * gtk/gtkenums.h : new enum GtkCornerType
        * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
        window_placement.
        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement):
        new method to set window_placement.
        (gtk_scrolled_window_viewport_allocate)
        (gtk_scrolled_window_size_allocate): few changes due to
        window_placement.
        * gtk/testgtk.c (remove_selection): fixed while loop.

diff --git a/ChangeLog b/ChangeLog
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c38c104225f5abf4b1303784038e52fda55d3a90..dc5490d5495542e697306bbeef947b9db79d945b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Mon Nov  9 00:39:20 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkenums.h : new enum GtkCornerType 
+       * gtk/gtkscrolledwindow.h (struct _GtkScrolledWindow): added
+        window_placement.
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_placement): 
+        new method to set window_placement.
+        (gtk_scrolled_window_viewport_allocate)
+        (gtk_scrolled_window_size_allocate): few changes due to
+        window_placement.
+       * gtk/testgtk.c (remove_selection): fixed while loop.
+
 Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkclist.c: check if column[i].button is valid before calling

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 38166455af2df1fc19fa186dcf63557112904a3b..c914fc4199c4537360e260f374a8be8ab34564ae 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -136,6 +136,15 @@ typedef enum
   GTK_ORIENTATION_VERTICAL
 } GtkOrientation;
 
+/* Placement type for scrolled window */
+typedef enum
+{
+  GTK_CORNER_TOP_LEFT,
+  GTK_CORNER_BOTTOM_LEFT,
+  GTK_CORNER_TOP_RIGHT,
+  GTK_CORNER_BOTTOM_RIGHT
+} GtkCornerType;
+
 /* Packing types (for boxes) */
 typedef enum
 {

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 046e5eb47280445e2ebee9cf89ba26c1726db017..f64f8d771eb2388391062ab5bdb3ec3857fed384 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -201,6 +201,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
   scrolled_window->vscrollbar = NULL;
   scrolled_window->hscrollbar_policy = GTK_POLICY_ALWAYS;
   scrolled_window->vscrollbar_policy = GTK_POLICY_ALWAYS;
+  scrolled_window->window_placement = GTK_CORNER_TOP_LEFT;
   scrolled_window->autogenerated_viewport = FALSE;
 }
 
@@ -289,6 +290,21 @@ gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window,
     }
 }
 
+void
+gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window,
+                                  GtkCornerType      window_placement)
+{
+  g_return_if_fail (scrolled_window != NULL);
+  g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
+
+  if (scrolled_window->window_placement != window_placement)
+    {
+      scrolled_window->window_placement = window_placement;
+
+      if (GTK_WIDGET (scrolled_window)->parent)
+       gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+    }
+}
 
 static void
 gtk_scrolled_window_destroy (GtkObject *object)
@@ -517,7 +533,14 @@ gtk_scrolled_window_size_allocate (GtkWidget     *widget,
        gtk_widget_show (scrolled_window->hscrollbar);
 
       child_allocation.x = viewport_allocation.x;
-      child_allocation.y = viewport_allocation.y + viewport_allocation.height + SCROLLBAR_SPACING (scrolled_window);
+      if (scrolled_window->window_placement == GTK_CORNER_TOP_LEFT ||
+         scrolled_window->window_placement == GTK_CORNER_TOP_RIGHT)
+       child_allocation.y = (viewport_allocation.y +
+                             viewport_allocation.height +
+                             SCROLLBAR_SPACING (scrolled_window));
+      else
+       child_allocation.y = GTK_CONTAINER (scrolled_window)->border_width;
+
       child_allocation.width = viewport_allocation.width;
       child_allocation.height = scrolled_window->hscrollbar->requisition.height;
       child_allocation.x += allocation->x;
@@ -525,18 +548,22 @@ gtk_scrolled_window_size_allocate (GtkWidget     *widget,
 
       gtk_widget_size_allocate (scrolled_window->hscrollbar, &child_allocation);
     }
-  else
-    {
-      if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
-       gtk_widget_hide (scrolled_window->hscrollbar);
-    }
+  else if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
+    gtk_widget_hide (scrolled_window->hscrollbar);
 
   if (scrolled_window->vscrollbar_visible)
     {
       if (!GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
        gtk_widget_show (scrolled_window->vscrollbar);
 
-      child_allocation.x = viewport_allocation.x + viewport_allocation.width + SCROLLBAR_SPACING (scrolled_window);
+      if (scrolled_window->window_placement == GTK_CORNER_TOP_LEFT ||
+         scrolled_window->window_placement == GTK_CORNER_BOTTOM_LEFT)
+       child_allocation.x = (viewport_allocation.x +
+                             viewport_allocation.width +
+                             SCROLLBAR_SPACING (scrolled_window));
+      else
+       child_allocation.x = GTK_CONTAINER (scrolled_window)->border_width;
+
       child_allocation.y = viewport_allocation.y;
       child_allocation.width = scrolled_window->vscrollbar->requisition.width;
       child_allocation.height = viewport_allocation.height;
@@ -545,11 +572,8 @@ gtk_scrolled_window_size_allocate (GtkWidget     *widget,
 
       gtk_widget_size_allocate (scrolled_window->vscrollbar, &child_allocation);
     }
-  else
-    {
-      if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
-       gtk_widget_hide (scrolled_window->vscrollbar);
-    }
+  else if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
+    gtk_widget_hide (scrolled_window->vscrollbar);
 }
 
 static void
@@ -559,7 +583,6 @@ gtk_scrolled_window_add (GtkContainer *container,
   GtkScrolledWindow *scrolled_window;
   GtkArgInfo *info_hadj;
   GtkArgInfo *info_vadj;
-  GtkArg arg;
   gchar *error;
 
   g_return_if_fail (container != NULL);
@@ -694,11 +717,29 @@ gtk_scrolled_window_viewport_allocate (GtkWidget     *widget,
   allocation->height = MAX (1, widget->allocation.height - allocation->y * 2);
 
   if (scrolled_window->vscrollbar_visible)
-    allocation->width = MAX (1,
-      allocation->width - (scrolled_window->vscrollbar->requisition.width + SCROLLBAR_SPACING (scrolled_window)));
+    {
+      if (scrolled_window->window_placement == GTK_CORNER_TOP_RIGHT ||
+         scrolled_window->window_placement == GTK_CORNER_BOTTOM_RIGHT)
+       allocation->x += (scrolled_window->vscrollbar->requisition.width +
+                         SCROLLBAR_SPACING (scrolled_window));
+
+      allocation->width =
+       MAX (1, allocation->width -
+            (scrolled_window->vscrollbar->requisition.width +
+             SCROLLBAR_SPACING (scrolled_window)));
+    }
   if (scrolled_window->hscrollbar_visible)
-    allocation->height = MAX (1, 
-      allocation->height - (scrolled_window->hscrollbar->requisition.height + SCROLLBAR_SPACING (scrolled_window)));
+    {
+      if (scrolled_window->window_placement == GTK_CORNER_BOTTOM_LEFT ||
+         scrolled_window->window_placement == GTK_CORNER_BOTTOM_RIGHT)
+       allocation->y += (scrolled_window->hscrollbar->requisition.height +
+                         SCROLLBAR_SPACING (scrolled_window));
+
+      allocation->height =
+       MAX (1, allocation->height -
+            (scrolled_window->hscrollbar->requisition.height +
+             SCROLLBAR_SPACING (scrolled_window)));
+    }
 }
 
 static void

diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index a29c7b2e94adbfab6566c2413d6f5bb0330f9ea1..20260f04a3b51a77f4afcca72a19143283635374 100644 (file)
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -53,6 +53,7 @@ struct _GtkScrolledWindow
   guint vscrollbar_policy      : 2;
   guint hscrollbar_visible     : 1;
   guint vscrollbar_visible     : 1;
+  guint window_placement       : 2;
   guint autogenerated_viewport : 1;
 };
 
@@ -75,7 +76,8 @@ GtkAdjustment* gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_
 void           gtk_scrolled_window_set_policy      (GtkScrolledWindow *scrolled_window,
                                                    GtkPolicyType      hscrollbar_policy,
                                                    GtkPolicyType      vscrollbar_policy);
-
+void           gtk_scrolled_window_set_placement   (GtkScrolledWindow *scrolled_window,
+                                                   GtkCornerType      window_placement);
 
 #ifdef __cplusplus
 }

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 4c571f93b7db6d6b957caaed4ef052aaedb1cbce..fa3429e690730516482dd8815751b424b58c2b55 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -4319,6 +4319,8 @@ void remove_selection (GtkWidget *widget, GtkCTree *ctree)
   while (selection)
     {
       work = selection->data;
+      selection = selection->next;
+
       if (GTK_CTREE_ROW (work)->is_leaf)
        pages--;
       else
@@ -4343,7 +4345,6 @@ void remove_selection (GtkWidget *widget, GtkCTree *ctree)
        }
 
       gtk_ctree_remove_node (ctree, work);
-      selection = GTK_CLIST (ctree)->selection;
     }
 
   if (new_sel)
@@ -4634,7 +4635,7 @@ void build_recursive (GtkCTree *ctree, gint cur_depth, gint depth,
                                       pixmap1, mask1, pixmap2, mask2,
                                       FALSE, FALSE);
 
-      style = gtk_style_new();
+      style = gtk_style_new ();
       switch (cur_depth % 3)
        {
        case 0:

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 4c571f93b7db6d6b957caaed4ef052aaedb1cbce..fa3429e690730516482dd8815751b424b58c2b55 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4319,6 +4319,8 @@ void remove_selection (GtkWidget *widget, GtkCTree *ctree)
   while (selection)
     {
       work = selection->data;
+      selection = selection->next;
+
       if (GTK_CTREE_ROW (work)->is_leaf)
        pages--;
       else
@@ -4343,7 +4345,6 @@ void remove_selection (GtkWidget *widget, GtkCTree *ctree)
        }
 
       gtk_ctree_remove_node (ctree, work);
-      selection = GTK_CLIST (ctree)->selection;
     }
 
   if (new_sel)
@@ -4634,7 +4635,7 @@ void build_recursive (GtkCTree *ctree, gint cur_depth, gint depth,
                                       pixmap1, mask1, pixmap2, mask2,
                                       FALSE, FALSE);
 
-      style = gtk_style_new();
+      style = gtk_style_new ();
       switch (cur_depth % 3)
        {
        case 0: